refactoring
pyM2SA
#7889577