Necessary commit of chagnes before moving to dev branch. (v3.1.6)