backporting PRIAM-193 to the 1.1 branch