2 way merge from branch. Includes support for local_ scripts.