changes related to merge with develop branch