Cleaned up base branch so it is not polluted with proposals found in other branches.