Merge "Enhance adding subscription logs" into pi-dev