Intermediary commit, upgraded to run with DM 4.1.2