Draft/lm r17 amf tag fixes

Merge request reports

Loading