Merge branch 'release-FixExpectationMaximizationFilter' into release

Change-Id: I40f7b848b17dd0ff541e36b882b79fb2b92dd461
Merge branch 'release'

Change-Id: I8bdea64dd2e04f666ca2b19b6b1182557cb74a25