merge from master
submod updates