Sync master (4.2.2) back into develop#1921

bartoszgadomski merged 3 commits into

developxwp/stream:developfrom

chore/sync-master-4.2.2-into-developxwp/stream:chore/sync-master-4.2.2-into-developCopy head branch name to clipboard