Clear double services values
Merge branch '2.3' of https://github.com/oe-alliance/oe-alliance-plugins into 2.3