Fix merge master2 dev

Fix merge master2 dev