Additional changes relating to the 2.17 release. Namely bugfixes and extending the user/setup api set now that it is included in the core