philipp-shared

lab7 cherry-pick

very important hofix commit