JirA-21275

JirA-21275