Re-added changes that are accidentally included in test branch