Merge "remove HFA logics"