assertion error
Merge branch 'develop' into v9.47.0