Kinda merge commit from release branch

Added history