Enhancement for avoiding restart on development