[1.2.4] Fix #1413

See #1413

Plus updated changelog and regenerated build/ files