0424 some updates
Merge remote-tracking branch 'origin/watabe_somelines' into dev