Bumping KS master version to 3.3.0
Resolving conflicts