reapply commit to feature branch

applies @kepper commit 1ad76c884be6e966c9350ff2778995bcde48c63c
for adding IDs an tstamps to corresponding feature branch