BUG: Another fix for Base/IO regression on Linux

Change-Id: If9e28f7b97e8681ca1887ad860642ac0e7e9933a
Merge topic 'AnotherFixForBaseIORegression'

7eeb3e7 BUG: Another fix for Base/IO regression on Linux