Merge "Make constraint objects serializable by Kryo"