BRBPL-3497 design tweaks