[Do not pull] Redstone PR for reference