Merge branch 'apache:master' into DIRSTUDIO-1317-Improve-CI