Cloud unification: exception handling in images manager view
Cloud unification: merging code with current master