More Core Changes.
negligible changes
Merge remote branch 'remote/master'