Bug 974337+974119 - Unified patch