CW-712 search_year_directive applied branch by patching sprint-5
Merge branch 'sprint-5' into develop