Merged differen-oil branch and master