Merge commit 'v0.90.6' into citrix