Merge From avplayer/avbot