Merge "Fix prep_volantis.sh freq printing" into nyc-dev