Pulling in latest from borisyankov

@jreynolds-daptiv, @hankyates-daptiv, @jacobboland, @park9140 please review and pull