Issues #5656, #5365