Merge branch '1471-tuning-advice' into 'develop'