Merge branch '0.11' into develop
Change remove -> hide, fix failing test.
Fixing feedback email related bugs.