SONATA-286 - Tweak block design