Merge "Let new APEX win in case of samegrading one on /data"