cases 24938, 25225 - automated dev build