Migration to 3.0 #3136