Merge "Fix NPE for CTS." into lmp-sprout-dev