fixed build fail due to recent changes in core dependencies
Merge remote-tracking branch 'origin/master'