merge #738 Admin RFP toggle