squash commit of mode-1710
merge mode-1908