[ADD][settings_improvement] backport from master

And same error for this external ID.