Built andr-1114 from commit 7dabea9 on branch master