Merge changes By officiallysonyrebel