I think so. The timelines that have been applied take into account a risk-based framework for how the receiving body will respond. That risk-based approach applies this idea of having until 2020 or 2040 to meet the regulations.
On March 10th, 2020. See this statement in context.