Small enhancements
Merge commit '56e32f29cb431d5dc174a40a63d8f04fa54add0a'