Add FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK as temporary solution for issue 1999, Closes #1999 See merge request !2231