Merge from avplayer/avbot