merge latest from master and fix conflicts but issues

latest