comparing 5.02.3 and 6-4-branch