Core update
Merge branch 'pr798'