Merge branch 'fix/blocked-user-boosts' into 'develop'