Apsct production

Changes for production testing of APSCT

assigned to @schoonderbeek

added 3 commits

• e8627ae5...9d5dc319 - 2 commits from branch master
• 0388db4f - Merge branch 'master' into 'apsct_production'

Compare with previous version

mentioned in commit fc87ff1d

merged