Merge from master
Bug fixes