Added max swap
Merge branch 'test' into dev