r5964: merging some fixes for 3.0.13