Merge commit 'origin/book-stable'