Merge "Include modules in cts_instant suite" into pi-dev