Merge "Updates for Fraser"