add title handling to generic blocks
Merge branch 'ticket-495' into testing