Merge branch 'develop' into Antoine
Rename matching function
Merge branch 'Antoine' into develop