Fix #1184 OmxRepository offset issue + various fixes and master merge