This is probably never going to be used for Sub unless there is some crazy situation I can't think of. However, we are continuing to maintain Copter changes for now to minimize divergence of the code and make maintenance easy.