Merge changes of 31.5 + 1.6