An ongoing collaboration among four US Department of Energy (DOE) National Laboratories has demonstrated key technology prototypes and software modeling tools required for new high-coherent flux beamline optical systems. New free electron laser (FEL) and diffraction-limited storage ring (DLSR) light sources demand wavefront preservation from source to sample to achieve and maintain optimal performance. Fine wavefront control was achieved using a novel, roomtemperature cooled mirror system called REAL (resistive element adjustable length) that combines cooling with applied, spatially variable auxiliary heating. Single-grating shearing interferometry (also called Talbot interferometry) and Hartmann wavefront sensors were developed and used for optical characterization and alignment on several beamlines, across a range of photon energies. Demonstrations of non-invasive hard x-ray wavefront sensing were performed using a thin diamond single-crystal as a beamsplitter.