Rebase commit
New commit added.
Removing accidental commti.
M1453-Script-Refactor: Moved devtools related functionality into devt… …
…ools.rs