Adapt for SPA operation

assigned to @yuha

created branch 24-adapt-for-spa-operation to address this issue

mentioned in merge request !22 (merged)

mentioned in commit 6b252b22

closed with merge request !22 (merged)