Revert "Merge branch 'features/Adam/image' into 'development'" See merge request nipa.das/sample_argon!5