Built code from commit d58ab0b on branch master