fr-2206 - Dolly goals

more about : fr-2206