add_support_r17_and_r18
