Merge "refstack: bugfix of testcase failure"