Revert "Revert "Merge branch 'mbryja' into test""

This reverts commit 69bfe1954c9722c9811f2f95b957c819f24376f2.