* Merge master-next changes in master (include vdi development in master branch)
The note is not visible to the blocked user.