Build #15871532774:   refactor fixes on branch v3.4 3 months ago