Merge branch 'hm/config-parse-expiry-date'