Merge branch 'develop' into 67-tmf628-lazyinitializationexception