Rebase to 15.6.2
Fixed: Bugs