GH-22: Change order of operation, as the container needs to be set prior to form discovery.
GH-22: Change order of operation, as the container needs to be set prior to form discovery.

droath/project-x,droath/project-x