Merge Custom scripts update into master