Consolidate branches
@grabanal we probably do want all the changes you made on top of master
branch, let me know if you want to push any changes before merging.
@grabanal we probably do want all the changes you made on top of master
branch, let me know if you want to push any changes before merging.