Merge commit
Changing references to vtop