Falcon-MR3 rebase
Lots of changes and updates