Micro service implementation for #1119