Merge "Code cleanup: remove redundant DST1 code" into nextgenv2