port PR #704 from Propel 1.6