Merged prod fix