Added ding_user_cache to make file
Merge branch 'development' into release