Merge remote-tracking branch 'Aniways/FixPushNotifications' into merges