Merge branch 'jk/fix-profile-feedback-build' into jch