Mco/aspen 5.2 fixes

Pulling updates completed so far to make customized tools compatible with Aspen v5.2.