RFC for PLA-1181  et. al. (do not merge!)