Interim merge of release-3.1.1 branch