Merge "Change message count overflow to 6" into sc-dev