Updates for 4.2.d. This makes it incompatible with previous versions (4.2.c)