#3667 skip unique_id and add place holder fields for empty data
Merge branch 'master' of https://github.com/maqetta/maqetta.git