Built code from commit 3dfbad8 on branch development