Add option for diff expire #1552

Job	Run time
ubuntu-test-install (public)	2m 59s
ubuntu-test-install (middle_schema)	3m 9s
	6m 8s

Provide feedback