fixes in custom script
Merge branch 'master' into edge