Backport from master branch

Please first commit to develop branch