Merge pull requests to next branch

prs: 1254, 1293, 1286, 1290