https://flow360.atlassian.net/browse/SCFD-2622
https://flow360.atlassian.net/browse/SCFD-2622