Merge "Add close elements through code"