Merge changes from topic 'required_checker'