Merge branch 'master-Querela'