Merge pull request #1 from intalio/master

fetching updates
Merge pull request #2 from intalio/master

New change merge
Changes made for common build
Merge pull request #1 from khyatidesai/K2

Changes made for the common build