MIFOSX-1452 and Fixing loading issues due to angularloacale dependency