Periodic editing check-in
merge