Move function invocation and change signature as variable is available in shared scope
Move function invocation and change signature as variable is available in shared scope

plone/mockup,plone/mockup,plone/mockup