Merge branch 'feature/more-interpolations' into develop

2 jobs for develop in 6 minutes and 33 seconds