Ref: CE-6

Signed Shneider.