merge from jmacglashan