Merge branch 'master' into 'report'

# Conflicts:
#   setup.cfg
#   src/apd/ap_info.py
3 jobs for !16 with report in 48 seconds
latest merge request