SONATA-398 - Fixed presentation