Add new indexes for 3.01a-integration merge