merged back from build branch let's hope you all agree