fix extract method. revert engine changes.
[log] fix a typo lead to a CCE
Merge remote-tracking branch 'origin/master'