Fix redmine #2936

(cherry picked from commit 10e13854842df6c9356421c9de6fa9103559c163)

Include changelog update.