BERNADETTE-2354

BERNADETTE-2354