Merge "Fix empty contact"