Second commit of !108 (closed) only, but using the existing class name instead.
@arichardson @ervin @dfaure @meven @davidre