Use member function instead of regexp to check services array
Merge branch 'irregulator/develop' into develop