Built andr-1114 from commit 6fa4bf1 on branch master