Reopen and freeze the code again

due of one emergency fix for stable release

Change-Id: Id3334663c45052e87a635b2eba5221123efb8be8