Merge "Flag showing logo on bp" into main