Updated v4 support library: revision 21