make generic blocks editable
Merge branch 'ticket-495' into testing