Fixed - CON-833
Merge branch 'K2' of github.com:bapiraju/tempo into K2