+act #15542 Remove remaining references to FiniteDuration and to Option FiniteDuration