UI-3263
Merge commit '3c9cf6d63d24072b81868ce49eed3cdb7a03a87e' into HEAD