Merge "BUG 5634 : Implement concurrent message limit"