Attempt at fixing 499
Merge remote-tracking branch 'origin/develop' into develop
Minor changes and fixed #499
Merge remote-tracking branch 'upstream/develop' into develop