minor merge Adrian/Brendan/Hugh