Merge branch 'hektech-changes'