General

This pull request is to integrate changes that do not fit in other branches.