On Going Bug Fixes for RC12 - DO NOT MERGE until internally approved

This is the bugfix branch for RC12, please DO NOT MERGE until testing has finished