Fix a bug around non-parametered CSI handling
Minor fix
Update ChangeLog
Bump version