* commit '1d2dcf7fefa705f4a89bba84234672e87cb4c7aa': Fixing various QS issues. (Bug 7216908, Bug 7217154)