Improved service change code.
Merge branch 'test' into dev