bugfix in lifetime data members definition
added changes as in pull request #1910
added files that were not included in the last commit to finish merge with #1910