LS: restored pull request - merge