r9355: updates