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