Merge "Merge remote branch '1.3-rel'(38203e6)"