merge 1.3 into master

3 jobs for master
Status Name Job ID Coverage
  Test
canceled run-appdata #20661

canceled run-tests #20660

 
  Build
canceled run-build #20662