Added tag 5.4.2 for changeset 7adcf1397f6e