Merge "Use std::list to store Behavior objects"