Merge "(AutomatedTests) Synchronise TestSingletonService with Adaptor" into devel...