Merge from development 1.1.1

Fix re-racking