Ported and tested in VIviado 2014.2