Merge branch 'devel' into multiple-base-imgs