Bug 974337+974119+975802+976875 - Unified patch