Merge branch '2-3-stable'
improve documentation