Issue #1774310 by cpliakas: Refactored code to only act on the status message while leaving other messages alone.