Updated code to reflect deprecated 'core', replaced with 'facet'.
Merge origin/master