[IMP]add session tag for yaml and based on session user whole yaml tested
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[IMP]revert changes as per new spec
[IMP]remove extra spaces
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk
[MERGE]sync with trunk