minification with changes 1a5e055d and 5f98c8345