"204 - Rob C's NSS fix" is done and since we enter feature freeze now I moved

the remaining three issues to next release since they are about new things and
not just fixing bugs