[#48656383] Custom navbar v1.
Merge remote-tracking branch 'origin/master'