Feature Branch: feature/monkeysign
Parent Task: #6338 (closed)
Original created by @intrigeri on 6455 (Redmine)