G-2034: (update needed)

Owned by Echoklang