Implement InCore & OutOfCore lif access
Merge branch 'develop'