Backport BKGCAT fix to 2016-patches

Backport BKGCAT fix to 2017-patches

See merge request !764 (merged)

(cherry picked from commit a05d6fb6)

1b4d513c backport bkgcat undefined fix