Merge with Pansenti/SyntroView