Merge "Bug 502 improvements"