sync commit
Small changes
Merge from remote
Some small performance fixes