Issue [#2200269]