Merge remote-tracking branch 'origin/Enable_hardcoded_presentation_for_French_Class' into CleaningDevelopment
