Merge "back port upstream patch"