Built andr-1114 from commit 95dd558 on branch master