Merge "A tempest test in services API using unsafe assert"