local dependencies branch merged into develop 0.2.4.23