CLOUD-118 HiMoved implementation from aspect to service