XD-906: Changes post Gunnar review