(GPPLATFORMCORE-53) Fixed incorrect resolve messages with empty values