Oscaro 1.7 first backports