Sync from knowtific/helppuff@dfb3765
Sync from knowtific/helppuff@54a0130
Sync from knowtific/helppuff@c913c73
Sync from knowtific/helppuff@ef8a3d8