Sync commit
Sync commit
Core & contribs upgrade
Updated feature
cleanup