last message fix
Merge branch 'last_message_fix_revised' into staging