Merging latest code from master into devel

add_aux_band - preparing for build to give to JPL for testing