1545 redo

apologies - had to find the conflict that prevented branch merge - the other branch was the problem...