Merge changes that fix frame_list