Merge "Update all Oslo module use"