Resolve "Implement ATMA"

Merged Mark Andrews requested to merge 619-implement-atma-v9_12 into v9_12

Merge request reports