trq-2423 added fix to 4.5.0