Ref: CE-7

Signed Shneider.