Apply changes again
Rebasing and merge
Fix null Positionable values
Move Positionable to app project
Correct import line
Fix JavaDoc failures
Merge branch 'feature/manual-component-registry' into merged
Merge branch 'feature/positionable' into merged