Merge "Update status messages to fix bug 49"