Merging latest from boris

@jreynolds-daptiv please pull