Resolve #3614663 "Ah code changes"

Closes #3614663

Merge request reports

Loading