Project com_services - conflict resolve

PR to remove conflicts in com_services branch and apply latest changes