Merge remote-tracking branch 'refs/remotes/origin/rmzamora-master' into 2.1