8.0 account mapping

Merged Sebastian Kennedy requested to merge 8.0-account_mapping into 8.0-stage

Merge request reports