Merge of 1.7.8 branch.
Merge remote-tracking branch 'upstream/develop' into develop