merge 7.3.4 branch to development