Merge branch 'topic/monotonic' into for-next