Move profile_subject to parent
Merge branch 'distribution-plugin' into cirandas