KFSCNTRB-846 Additional changes so fiscal year is considered