432436 updated to match m2e core changes

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>