[DF-1702] update stretch vertical/horizontal logic