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