squashing all changes from PPOC-324 with master up to date