Merge branch 'ESS-LLP-dev_hra' into develop