Merge lint fix branch