Improve logging of phase-writer scritp
Merge branch 'release/v2.1.16'