Merging post R13 hotfixes