Feature/v6.0.0

Issue:  http://pm.qbox.me/redmine/issues/2775