Merge "(Bug 41298) partial fix: re-applying Id7b331e1b"