fixed error with local normalizers
Merge remote-tracking branch 'upstream/sr' into sr2