Merge branch 'master' into log_links.MLHR-781