Built andr-1114 from commit d1af97a on branch master