Merge branch 'release/1.5.5' into develop
WIP
updated gitignore
WIP
rp
Merge branch 'release/1.5.5'