Merge "aaf mapping fix"