ElectroService\WAP#14 internal changes