#1024 Reworked a4131d6a5a373efe88bd7e699b68d3ba8dcca0b5, added new Variable instances for point constraints