Merge changes from topic "unify-common-flicker" into main

* changes:
  Unify common into parser and flicker (Pt. 2)
  Unify common into parser and flicker