Built andr-1114 from commit 41ee55b on branch master