Merged build wip branch into stable