Open The Box : update scenario for final review
better support to apam callbacks
merge origin/master (by hand)