fix(wrong change): Go back to code in e9b0d4a, and readd star support
fix(wrong change): Go back to code in e9b0d4a, and readd star
support

RavenB/Z-Push-contrib,Freeaqingme/Z-Push-contrib,fmbiete/Z-Push-contrib,mta59066/Z-Push-contrib