Pull changes from oyachai