Merge branch 'refactoring'

2 jobs for master in 1 minute and 55 seconds (queued for 5 seconds)
latest