[EmptyEpsilon] (2 commits) Non-fast-forward update to branch f25