7.x 3.x basic 687

@jbickar ready for review