Merge "Enhance adding subscription logs"