Include dev's recent changes