[v6r10] Fixes after merging - v6r10 onward

Restored few functionalities that were lost during merging.