fix new brb design
version 2.1.9
Merge branch 'release/2.1.9' into develop