Removing bad period
Merge branch '2.3' into 2.5

* 2.3:
  Removing bad period