17 Commits (PYADPT-110)