Fixes for https://roadmap.entgra.net/issues/10679 Co-authored-by: Subodhinie <subodhinie@entgra.io> Reviewed-on: community/device-mgt-core#360 Co-authored-by: subodhinie <subodhinie@entgra.io> Co-committed-by: subodhinie <subodhinie@entgra.io>