Reverting pull request as it was moved to devel branch.