Case 2607 - Small changes to allow extension.
Merge remote-tracking branch 'origin/case-2607' into develop