Merge \\"Add test for RefBase etc.\\" am: dc9fbc3440
am: 2b67ca305e

Change-Id: Idaa05a5bcff2bc8ccf12247ebbfddc5a16a66afe