PLA-1579 routing key generation changed