Refactored reference shortening utility (added expression references shortening and rewritten to Kotlin)
Minor refactoring in ResolveSessionUtils
Fixed bug in reference shortening
Buildserver auto merge