Sync with [27147] and [25284]. Fixes #23
Update readme file. Fixes #24