Sync'ing latest from master to dev

Now that we have dev branch available, commits should be applied to that. Fixing latest mistakes between the branches to keep dev as the latest one.