MEDIUM / Prevent infinite loop in add flexo concept instance
LOW / Prevent NPE
LOW / Update 1.6/1.7 convertion