support for I-87040

Signed-off-by: Sergei Ianovich <ynvich@gmail.com>