fix choices_SWS for GP
Merge commit 'github/testing' into beta