Changes for phi-merging - needs vtop branch merge