Improved Condition for prototype check
Merge branch 'feature/observe_autocompleter_prototype' into leonex