DF-5548 fix for stretchCap.
Merge branch 'development' into wotg_merge_final