fix sortdata from outside abm
Merge branch 'feature/126-upgrade-abm'

* feature/126-upgrade-abm:
  fix sortdata from outside abm
erge branch 'master' into prod

* master:
  fix sortdata from outside abm