Re: #5589: Unblock bamf from all branches