Merge branch 'ps/test-chmtime-get'