Proposal to fix Issue #2305 (Master)

Proposal to fix Issue #2305 for Master