Merge of 1-7-stable with master

Merging remaining commits with master from 1-7-stable.