Merge remote-tracking branch 'upstream/master' into 19986
Merge remote-tracking branch 'upstream/master' into 19986
fixing press links
Merge pull request #45 from joanneci/19986

code review for 20133