DBC 1126 - Adds strongarm settings.
Merge branch 'DBC-1126' into develop