MAP-954: more qa checks