Hi, please pull the latest dev to ensure fewer conflicts at merge, lately the merge from dev to master had 107 conflicts ;-)
The request closes automatically on merge