Moved to 4.2.0
UI changed
Merge branch 'master' into 4.2.0
UI changed