Merge "Remove flag disabling ryuk from properties"