[1893] applied patch from 2.1.7 and removed filter of current mandant