Rebasing and merge
Fix null Positionable values
Move Positionable to app project
Correct import line