SONATA-444 - Refactored block