WP-3298 Changes related to new year field