Re: [master/rhel7-branch] Fix PWQError issues. (#1066988)