Reducing API Footprint on user load.
Merge branch 'master'