Merge "InactiveApplicationException-junits"