Update with changes added to master

Merge to avoid any conflict when this branch will be ready to merge
back to master