Auto-539-test (ready for review)

To be merged after PR #372