Merge "Change high/low bound logic for manual date/time"