Merge "Add missing break statement in Sap message handling"