manual merge d90a331 to avoid conflicts

Merge commit 'd90a331'