Adapted constraint generation algorithm for skeleton intersection to comply with new database model
Resolved merge conflicts