Implementing all pending PR