MAP-985:  Revised pre-release QA checks
MAP-961:  Short normal form