Changes for client side configuration utility
Merge branch 'config' into develop