End of porting commits from tc_aowow