Sync from knowtific/helppuff@065359d
Sync from knowtific/helppuff@54a0130
Sync from knowtific/helppuff@ef8a3d8