Merge branch 'fix/2579-finger-content-type' into 'develop'