UI-3263
Merge commit '3c9cf6d63d24072b81868ce49eed3cdb7a03a87e' into HEAD
Merge commit 'e327c8fd7489254c643c2f5bf6cb65c76fac6b98' into HEAD