Closes sysadmin#17868 (closed)
Please merge master → stable → devel after merging this.
master
stable
devel