Merge pull request #4489 from Ansuel/adanced-client