Some changes
Merging Core 7.0