3.4.87

Signed-off-by: kecinzer <kecinzer@gmail.com>
Merge remote-tracking branch 'upstream/nightlies-4.4' into sm-4.4