Merged this branch to current changes