Automatic merge from release/1-staging -> development
Automatic merge from release/1-staging -> development

* commit '6aea2a3b28798cbcb8d9f0fb778d667d36ded0e5':
  SMP-9269 blue fix

revenuewire/jackfruit-redoc,revenuewire/jackfruit-redoc