Merge "LINT: remove space from lint declaration" into main