Issue 798: merge for potential 1.3.0-rc-2