Merge "fix AlmostFullTest: prevent reinitializing ref-counter" into jb-mr2-dev