Merge "fixes for several logical bugs"