Story 1609: Fix after header update.
Story 1609: Fix after header update.
Merge branch 'canfar_dev'