Built andr-1114 from commit d9ed2c3 on branch master