Merge from packaging branch #4

Closed jrattanpal closed 4 years ago