Merge branch 'fast_track' into for_next