Issue 6758 resolve 3 1 build issues