QuickFix
Merge branch 'RefineRights'