Merge "Prevent interacting with secondary handle if not initialized" into sc-dev