Forced the brach update because of rebase has failed.
This branch now is compatible with 1.5.1.pre1 snapshot 2.