Fixed errors with packages, modifiers and imports
Merge branch 'develop' into 4.5.4