some merged changes, close to develop branch