#6807 - Cherry-pick fix from Azure M8 into master
This is a fix for https://dev.azure.com/OpenEnergyPlatform/Open%20Energy%20Platform/_boards/board/t/DDMS/Backlog%20items
The fix was done in Azure M8 but never merged back into OSDU.
Original MR is here: !178 (merged)
Edited by Dmitriy Rudko