Mantis:Codev-162226-Note: This step is optional/en

Note: This step is optional