Added tag 8.4 for changeset 9774315f7705