DBC-1134 - Fixes boosting.
Merge branch 'DBC-1134' into develop