Merge "Prevent message truncation by populate function" into dev-b