BUG: Fix regression in Base/IO

Change-Id: Ief1efb8a7827ed3ce124eb2430cb9320773d56fa
Merge topic 'FixBaseIORegression'

c599218 BUG: Fix regression in Base/IO