fix apply changes for client
Merge remote-tracking branch 'origin/develop' into develop