Fix #987

(cherry picked from commit 7f591a261899e6a969603845810477dc1097d8ed)
Updated changelog
Regenerated build/ files