This commit merges the branch arithmetic/propagation-again into trunk.