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

DO NOT MERGE until testing finishes