Merge latest (3-way w/ BC)