Merge remote-tracking branch 'origin/enhancement/revise_object_structure' into...

Merge remote-tracking branch 'origin/enhancement/revise_object_structure' into enhancement/revise_object_structure

Conflicts:
	enpt/model/metadata.py
4 jobs for enhancement/revise_object_structure in 6 minutes and 47 seconds (queued for 2 seconds)