jira/PJSM-229

WIP
Do not merge.