merged feature/fx2 in v7fasttrack develop/7