Modified v4 support library
Merge for v4