Merge "Fixes Scoping bugs"