Built andr-1114 from commit 1e869f1 on branch master