fixes https://roadmap.entgra.net/issues/10279 Co-authored-by: osh <osh.silva@gmail.com> Reviewed-on: community/device-mgt-core#251 Co-authored-by: Oshani Silva <oshani@entgra.io> Co-committed-by: Oshani Silva <oshani@entgra.io>