merge master to dev for the last time

merge master to dev for the last time