Merge branch 'dev' of https://github.com/Acstylos/wpi-suite-tfij into feature/archive
Change-Id: Ic4af47aa4ca3996a1e5f6cc9b398f7524a2db133