Additional responsive work.
Merge remote-tracking branch 'remotes/Ali/master'.