change data abm to generic
Merge branch 'master' into stage