LPS-50915 Apply the same to select_parent