W-14987626 (chore): added features from master#175

tomsfernandez wants to merge 1 commit intodevelopaml-org/amf-custom-validator:developfrom

chore/add-fixes-from-masteraml-org/amf-custom-validator:chore/add-fixes-from-masterCopy head branch name to clipboard