Latest changes per ticket RNBS-631 batch II
