various adjustments
Merge commit 'f3b6ce7cd8a4b40b4294207b755360fa22b74913'