Merge "Changes for self release"