merged from openatv