Built andr-1114 from commit 06b1c69 on branch master