merge from master and fix conflicts