Bug 974337+974119+975802 - Unified patch