Merge branch 'installationscheck-devel-module-2170'