Merge remote-tracking branch 'changes/master'

Merged after file rename