merge 4.0.1 updated content from development/juno/ to stable/juno