Introduce hacking and solve all found issues

Change-Id: Ica586f27308a84a4911ef2754d7ae8852321055d
Merge "Introduce hacking and solve all found issues"