Merge branch '1406-compile-resources-help' into 'master'