Merge "Fix strict violation"