Merge branch 'r8152-minor-adjustments'