Staging sanath, merge edit pitch feature...

...for admins into main staging branch
This should have an endif.