QuetzalCEFN-1797

QuetzalCEFN-1797