Fix 'sub title' :bug: with tests :wrench:
Merge remote-tracking branch 'origin/master' into qa