merge in 10.8 work

10.8 work from ah76648.