Add boilerplate for grace period handling
Merge remote-tracking branch 'upstream/master'