Merge branch 'fix/test-failure-due-to/306' into 'develop'