Fixed merge issues
Revert "Fixed merge issues"

This reverts commit a23b1c9320a231464d9994c8d28c5efdcccabfdd.
Revert "Revert "Fixed merge issues""

This reverts commit 409d26d90f13210c8e542cccb1654d197b901925.
Fix more merge issues