* commit '34b11487d16a060ec36599f289bb37235ada75d7': A little more work on issue ##16907799.
523afd15
ad0a66ac
c1ce74ca