Merge pull request #1257 from sjinks/1.2.4

[1.2.4] Bug Fixes
Fix #1258
Regression test
Merge remote-tracking branch 'upstream/1.2.4' into 1.2.4