Merge branch 'r8152-bp-settings'