Merge "[571025] Adds missing source in build.properties" into develop