Allow manual re-index from CP

#4092