ANG-2561: Corrected an issue with the clock shifting and small header not shifting - RC