Merge recently changes