merge flash_message into master