Avoid potential database index overflow.
Merge branch 'develop' into release/12.0