apply missing commits since modularization

Jira-issues: WP-848, WP-666, WP-646