Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev