Thank you for clarification. Then this PR should be ready to merge.