Merge "Fix String is empty issue"