Fixes after env verion incrementation added

Change-Id: I479fbd4bad77b297ab04c61ad185304fc646d77d
Merge "Fixes after env verion incrementation added"