Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17

Merge-request: !5085