Merge "Changed to allow removal of remaining static stack ids from CTS."