LRDOCS-608: Address Rich's comments for WSRP