Merge "Fixing issues with minimal post processing and HDR conversion" into main