uk injection on 20140331-002102
uk injection on 20140423-100741
UI-3262
Merge commit '45077558a71d6773a3cd4f483368bc4d89f061b5' into HEAD
Merge commit 'b8af7d2d72072f34a2100cc4bd56fe861448c0a6' into HEAD