WF-1610, WF-1606, WF-1607 - Implemented
Merge branch 'K2' of github.com:bapiraju/tempo into K2