Merge "Removed stashing hotseat calls." into main