Merge "Update HCE return rules"