Merge "split modification to flyscript into separate file"