52 - Make current URL either dynamic or property in file
Merge remote-tracking branch 'origin/develop' into develop