Updated minorversions of the subcontent
Merge branch 'override-buttons'
Merge branch 'master' into toolbar-fix