Revert d2a304a..c4981c5

This rolls back to commit d2a304a7e457c45495d8bfad2010d5382e31ff6e.
share Intent modified

ver07 close to RC - after reverting back to an older commit