|#999|+Vinay| Fixing externalizations.