The deadline for NPOs to meet both reporting requirements is the 31st May 2019.