Merge branch 'fix/9874-https' into develop
Merge commit 'a580c4ba0d30f55546d3d181d7ea878e6a13133c' into develop