BZ-993126 Adapted modules to new depdencies - temporary removed lang3