Merge branch 'formatting_June' into formatting_after_acceptation_of_switches