Sync from knowtific/helppuff@08f42db
Sync from knowtific/helppuff@dfb3765
Sync from knowtific/helppuff@ad4c489