Finish merging SPF13 mappings