Merge branch 'yaz-621-optimized'