Merged Voku changes to Cortex. no bugs added. not this time. :)