Merge post 3.1.1 changes