Merge branch 'origin/feature/issue#124'