* commit '89ba270c6663c4f2c8076e21fa1a9f79a43e0b06': Fixing various QS issues. (Bug 7216908, Bug 7217154)