Merge branch '196-refactor-renderer-output-configuration' into 196-refactor-renderer-output-configuration-cleanup