v2.9.5 merge

see changelog