RM6299 changes