Vik/fabric merge branch