Merge "Add strict_mode: false" into main