Thiru | #1156 | Converted delivery plan service mode to native