Automatic merge from release/2-sandbox -> development
Automatic merge from release/2-sandbox -> development

* commit '2e83ea21f5bf012909722af199e15d696b149c8a':
  Merge pull request #1939 in SMP/jackfruit from feature/PAY-72-custom-templates to release/0-blue

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc