move stack as inner class in single thread job class
Merge master/master