bringing into line with the latest master build