Removed import
Merge remote-tracking branch 'origin/normal' into non-core-master