Latest changes from Pro extensions