manual merge of kingbd/master to master
cleanup