merge from JBMiller to RD dev