Merge "Fix return message format"