r19 expire changes from r17 to r18 [ver 3.1.7]