fixes #8364 - Adds SQL N+1 Query detection using bullet.
Merge remote branch 'origin/develop' into develop