Merge branch 'mr/complete-more-for-log-etc'