BUG: Update IOSTL to include new bug fixes upstream

Change-Id: Ibd91ce1bc1873cbf909985e82f149fb67e2507a8
Merge topic 'IOSTL-Fixes'

669d4389 BUG: Update IOSTL to include new bug fixes upstream