Hotfix de property long (reserved)
Merge branch 'hottfixLong'