pre-pre-merging 3.844

making this branch to show Joy's original milestone for evo and for
comparison stuff