Merge branch 'ja/do-not-ask-needless-questions'