Isolating HMVC branch for further RnD