Sync from knowtific/helppuff@a43408d
Sync from knowtific/helppuff@c671578
Sync from knowtific/helppuff@ef8a3d8