Merge branch 'issue#3987' into 'develop'

Added secondary template that will show in place of the original if dev mode is disabled.

Closes #3987

See merge request !3848
Status Job ID Name Coverage
  Unit
passed #6652
phpunit

00:00:49

 
  Acceptance
passed #6653
juice
codeception

00:00:17