Changes for beta for 1.11