Merge changes from mvo branch