Merge branch 'archmanweb-v1.2' into 'master'

Update archmanweb to v1.2

See merge request !426
2 jobs for master in 33 seconds (queued for 3 seconds)