[PDK-8824] Addressing review comments