Merge branch 'dockerfile-touchups' into 'develop'