Nnamdi dev branch

[Nnamdichukwu]

Made some minor fixes.

[kartojal]

Closing due not clear about the intention and also breaks current production interfaces