Merge "Bug 502 improvements"

No match.