best of z best
Merge https://github.com/b-mind/sunrise_core_r11