Merge branch 'cleanup-part-2' into devel-board