Sync from knowtific/helppuff@9abef07
Sync from knowtific/helppuff@918e135
Sync from knowtific/helppuff@065359d