Merged a few changes from other branch

Merged a few changes to sync to separate versions