Readded hiding to FW and added hiding to App in NMST