PR with WFBUILD-8 and WFBUILD2 commits