Merge "Use common LocalDateTimeTypeAdaptor for SO"