Merge rewrite to master