merge with develop: swapstack implementation

Merge request reports

Loading