Fixed issue with line computation when there is no 'a' in string
Fixed issue with unresolved alias to implementation
Merge remote-tracking branch 'origin/develop' into develop