Moved PositionBasedExpression outside of PositionBasedConnector class
Merge remote-tracking branch 'origin/position_connector'