Removed wrong assertion.
Merge branch 'daniel_2148' into next