Merge remote-tracking branch 'origin/1.x' into feature/INTCONTRIB-331