Forward port from 7.0