Merge commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97' * commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97': Fix CS templates to handle non-included classes.
Merge commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97' * commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97': Fix CS templates to handle non-included classes.