Sync Moorise

- https://github.com/Tuinity/Moonrise/commit/d71d640a4894ade561957a521377a540712ccd93
- https://github.com/Tuinity/Moonrise/commit/685e160f23fbc545ec830efe0eeeb053d44aa098
- https://github.com/Tuinity/Moonrise/commit/7aa61f63504140fde60609df53b1fc52b3fba3ad
- Sort of https://github.com/Tuinity/Moonrise/commit/adfd737278908d6162ec363ad247a662847ae94e