Format comment
Add support file for JENKINS-15923
fix JENKINS-15923