Merge branch 'FloatExpectation'