Prepare for client_location
Merge branch 'develop' into hhu
Switch to client_location