Merge Fubra Changes