Merge "Solve ubuntu vi problem"