ref #4028 - finalize
Merge remote-tracking branch 'origin/master'