FORUM-713 | Broken UI after moving back a forum
Merge commit 'a2b7fc52266a6f9babcd2712bc56da7d1f39de03' into HEAD