Change to support-v4 version 18