Merge branch 'master' into 2.4
Merge branch '2.4' into 2.5
Add no_confirm options
Change options name to y/yes