Keep store_start_and_stop_time on user
Merge branch 'master' into builds
7.211