[MERGE] Fixed merged
[YUV] Fixed from merge