Merge branch 'OCFXX-New_templates' into 'staging'

New templates for Issues and MRs

See merge request !114