Merge Ready : Backport develop win_pkg to 2016.11 with additional bug fixes
The note is not visible to the blocked user.