Issue [#2199783]