Sync from knowtific/helppuff@9abef07
Sync from knowtific/helppuff@ad4c489
Sync from knowtific/helppuff@878259d
Sync from knowtific/helppuff@ef8a3d8