Minimum stability stable.
Merge remote-tracking branch 'upstream/master' into BaseResourceController
clean up
DirtyCommit