prevent log propagation and APNs module bug fix