merged selected changes from dev branch