UI-3307 | UI broken when move in answer
Merge commit '65d577d3df370af9b350636ac22954ace816e2d2' into HEAD