IDEA-25295 (NPE on integrating change into branch)