Fixed library
Merge with development
Merge branch 'dev/j3/common' into dev/j3/free