Merge "(Automated Tests) Sync with core tests" into devel/master