merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending...