Built andr-1114 from commit 676a43f on branch master