Backport to API10
Merge ../../V2AndLib.UI/V2AndLib-mvnrepo