Merged changes with official script