Merge changes from topic 'shellcheck'