Merge version 304 of non-remote HQ app, except for first_measured_time formatting