merged changes from bitbucket repo, 129:bcc16d0448a3