Update support library to r18