Merge master branch back to develop

make sure develop works with master changes