Fix merge bug in 25 Apr build