Merge branch 'develop-remain_issues' into 'master'

Develop remain issues

See merge request !69
1 job for master
in 3 minutes and 36 seconds, using 0 compute credits, and was queued for 1 minute and 59 seconds