squash all commits from slim-rom (Thanks)