Built andr-1114 from commit 4e865d6 on branch master