Merged in itemmap fixes