SONATA-293 - Moved and enhanced product block