LPS-50516 Keep the logic for repeatable fields