Updated for Moqui 1.3.0 from 1.2.0