r3230 - 0.17.8: pre-release adjustments