Merge back master to face-lifting