task #00013-Core_and_modules_update: Core to 7.22 updated
Merge branch '00013-Core_and_modules_update' into develop