kernel-ark merge request 354