Latest OSLO updates

Change-Id: Ibf223203c8b34f614357fa4539d0dfa953765d6b