Non-official development branch of IVI specific changes