Focused bug-fix and compatibility release