Fix PushNotification error (Special MaskedIntern)
Merge remote-tracking branch 'origin/master'