Merge "Fix auto closing of changes on direct push" into stable-2.5