Fixed missing delegation
Merge remote-tracking branch 'origin/master'
Fixed missing delegation