Merge pull request #1354 from sjinks/1.2.4

[1.2.4] Backport bug fixes from #1347