Merge "Change condition init to return current condition"