merged from Eonblast's update