Merge "Fix strictmode violation"