Merge changes from topic "lf-release-jobs"