IBL-7: merged changes related to https://github.com/iplayer/ibl/pull/228