Merge branch 'fix/2108-adapter-options' into 'develop'