Merge branch 'amf/rules_update' into sprint50