Change to a more strict behavior
Merge branch 'strict'