Serena #3518

Serena #3518