Merge branch 'bcmring/cleanup' into bcmring/removal