Breeze: RA-41 fixing build