Merge branch 'develop' into 'develop'

APS deletion follows symlink

See merge request !1666
1 job for develop in 9 seconds (queued for 2 seconds)
latest