merge to gsn/cdn

bronze self-help tool work