Updated CI scripts: merge to master