config stuff & deprecated
Merge branch 'feature/us462' into develop