ml action class
Merge pull request #1276 from waveney/wav31

Version 3.6603
Merge pull request #1277 from eternaldensity/master

Version 3.6603