Built andr-1114 from commit 79cedcf on branch master