Merge "(Automated Tests) Synchronised common files with Core" into devel/master