Merge "Fix error with remembered sets creation."