UI-3262
Merge commit '45077558a71d6773a3cd4f483368bc4d89f061b5' into HEAD