For the merger: applying this one to integration branch means changing line 209 of TransformationDB.py