And update docs reflecting the changes in the latest commits
Additionally fix an update problem occurring with custom views