Merge branch 'develop'
Added management of base field of oauthd
Added management of base field of oauthd
Merge branch 'Patches/oauthd-url-fix' into develop