make plural s lowercase
merge 3.3
merge 3.4