Merge branch '777-fix-for-combined-render-config-file' into 777-render-config-reader-fails-to-read-combined-config-file
