context listener + IdP management provided
Merge changes
fixes license header