Merge "Fixes possible issue with no-op creator." into pi-dev